tree 06ef8c1c3d8228991031e2fa2e0bb4fc2d474785
parent b1b76c34f5cb5c6f912a20361551f4be49707c95
author Ryan Savitski <rsavitski@google.com> 1623335976 +0100
committer Ryan Savitski <rsavitski@google.com> 1623336710 +0100

Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingIntent.

Fixing build by getting rid of the erroneously merged conflict markers,
and applying the end state of ag/14651125.

Bug: 183927137
Merged-In: I881a2b79462e8d420b3dcb6a6b98adbe9e8e0394
Change-Id: I70acd4ce48853be728be1fb80b4b885d00a059a9