Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12794770

Change-Id: I44386a01dea9e2102c3b2e5f8ecbbf59f2ad8c48

.. to match behavior post I1f9662c2bd14b34e00fbc8ebb926538f0329c37a

Bug: 167593637
Test: Javadoc change only.
Change-Id: I4cb9fe4a5ae74b1474f9da39b6aeb3a374f8cf12

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12653063

Change-Id: I2681da6b3919efa0bf86241169219567c15e1864

Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6d am: a2a586a6 am: d29dc3d9 am: e7069bce am: f1c03846

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135

Change-Id: I3a3bbd6f1b810d006cbe5e3e06fd00aa5bf09b0d

Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6d am: a2a586a6 am: d29dc3d9 am: e7069bce

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135

Change-Id: I0b180698048fb1c643d90f2d038d1df8d66fc671

Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6d am: a2a586a6 am: d29dc3d9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135

Change-Id: Ic730c4d98a309aadcde740d77582ffb7d788337f

Merge "Fix storing the wrong value of mLockdown in setting" into oc-mr1-dev am: 83739b6d am: a2a586a6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135

Change-Id: Id5bfe41bdf8ce53c5da5e9d6322abf7f9df46837

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12735135

Change-Id: I52b4099eca7e8c8069b7fd7446784aae1a0569bc

[automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249 -s ours am: 816fd66d -s ours am: d840f0c7 -s ours am: 88ec485f -s ours am: 3b9f0fb6 -s ours am: 3ea188d4 -s ours am: 81373b0b -s ours

am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 e57c25a4 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12779618

Change-Id: I1ca9ae321eba730688222bf132953b5e9c67ab25

[automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249 -s ours am: 816fd66d -s ours am: d840f0c7 -s ours am: 88ec485f -s ours am: 3b9f0fb6 -s ours am: 3ea188d4 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12779618

Change-Id: Iff6123ae0567a9066158c2c4b7a07ec3508e1bd7

[automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249 -s ours am: 816fd66d -s ours am: d840f0c7 -s ours am: 88ec485f -s ours am: 3b9f0fb6 -s ours

am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 e57c25a4 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12779618

Change-Id: I85309b43227c6fcbea1310281ccf7b42981bf1ca

[automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249 -s ours am: 816fd66d -s ours am: d840f0c7 -s ours am: 88ec485f -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12779618

Change-Id: I6c39f346377c9f591d4207b3c2288344470276e6

[automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249 -s ours am: 816fd66d -s ours am: d840f0c7 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12779618

Change-Id: I36bdfb8c03950173e51ea9815a6fda619126aff8

[automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249 -s ours am: 816fd66d -s ours

am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 e57c25a4 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12779618

Change-Id: Idefd4af0be5dce2baf988135f3062029749dc95b

[automerger skipped] RESTRICT AUTOMERGE Implement sendBroadcastAsUserMultiplePermissions in BridgeContext. am: 752cb249 -s ours

am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 e57c25a4 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12779618

Change-Id: I19aeca326d6f4faae382fb6a140acde81602eb3a

sendBroadcastAsUserMultiplePermissions was added to Context.java.
Implementing in BridgeContext.

Fix oc-dev since BridgeContext is in frameworks/base/tools/layoutlib,
whereas in later branches the file is in frameworks/layoutlib

Test: Compile / build (actual usage is documented in other bugs)
Bug: 159373687
Change-Id: I8715b6fce7039268eb29914cb15f68ab922f4d3f
Merged-In: I857ea00cc58a0abbb77960643f361dd6dd9c8b56

[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628 am: 60cf3eeb -s ours am: 615d6b6b -s ours am: aeac5e7d -s ours am: 5c2b86fb -s ours am: 4c94806e -s ours am: 008d947b -s ours

am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12724292

Change-Id: I85509e7b2ad905c15e7280bf2d6b57c02ea068fb

[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628 am: 60cf3eeb -s ours am: 615d6b6b -s ours am: aeac5e7d -s ours am: 5c2b86fb -s ours am: 4c94806e -s ours

am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12724292

Change-Id: If5edb76ce859af8506a381856c6b3b0058aee541

[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628 am: 60cf3eeb -s ours am: 615d6b6b -s ours am: aeac5e7d -s ours am: 5c2b86fb -s ours

am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12724292

Change-Id: Id637abc5705e488e2bc77122e052b9d3ea475ae3

[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628 am: 60cf3eeb -s ours am: 615d6b6b -s ours am: aeac5e7d -s ours

am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12724292

Change-Id: Ic97189261040a3eef447064ceed038727fb11120

[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628 am: 60cf3eeb -s ours am: 615d6b6b -s ours

am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12724292

Change-Id: I7bedb3b7b8da1bdbe3f483b5186d7864ffc22f7a

[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628 am: 60cf3eeb -s ours

am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 ea7ef4ad is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12724292

Change-Id: If0bd01e56bc171cf50e01443bdac78bc149dd64b

[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-mr1-dev am: 3d92e370 -s ours am: 8a936e08 -s ours am: b9edc63f -s ours am: 79148d59 -s ours am: 3c8124a2 -s ours

am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 f955e56d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12729621

Change-Id: I2e194f584a5dab5be0af93662ea2ee61572a41eb

Make WallpaperMS bind wallpaper component PendingIntent immutable. am: b3929030 am: f75396d3 am: 286aa8b9 am: 7e53b789 am: 7e24456d am: c201373d am: 46bdd4af

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718696

Change-Id: I387032e7d582bb08f4c241dd23dd1046b7338d05

Make WallpaperMS bind wallpaper component PendingIntent immutable. am: 178da54f am: 6ea35592 am: 5b295c77 am: b3fd083c am: 254924da

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718925

Change-Id: I3dde790cb91c34073396ff7c16e19ee55a59b74c

Merge "Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into pi-dev am: 416332cf" into qt-dev am: 2426f275 am: 8a6fa4c1 am: 75b76436

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12715966

Change-Id: Ic863fe68f37cc7e03d4dbd81fd611cc68446f7fd

[automerger skipped] Merge "[DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry" into qt-dev am: 0b5b9eed am: e45ec287 -s ours am: 94e5401f -s ours

am skip reason: Change-Id I8caa3ea409836ce8469d8d8210b481a0284594f2 with SHA-1 cc584e77 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12664597

Change-Id: Id0c890f9d9f00c7b00164fe3ac4f4d1799ad00ee

[automerger skipped] [DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry am: 81bab8b8 am: e1a23c7e -s ours am: d5bb4990 -s ours

am skip reason: Change-Id I8caa3ea409836ce8469d8d8210b481a0284594f2 with SHA-1 cc584e77 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12664597

Change-Id: I605e9b72eb6a090fa40aea83fc885d8590808a44

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12724292

Change-Id: Ic35e179d67e2804f71d53489101d1c6efc05f156

[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-mr1-dev am: 3d92e370 -s ours am: 8a936e08 -s ours am: b9edc63f -s ours am: 79148d59 -s ours

am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 f955e56d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12729621

Change-Id: Ida2be85706ade89a4db9db7db97c8a027f47c05e

Make WallpaperMS bind wallpaper component PendingIntent immutable. am: b3929030 am: f75396d3 am: 286aa8b9 am: 7e53b789 am: 7e24456d am: c201373d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718696

Change-Id: I648c5523d1895dd93a49e39431894d504ea74e2b

Make WallpaperMS bind wallpaper component PendingIntent immutable. am: 178da54f am: 6ea35592 am: 5b295c77 am: b3fd083c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12718925

Change-Id: I5cae667d955f7cf02180d1a30ee8cbff976f5bfb

Merge "Merge "Make WallpaperMS bind wallpaper component PendingIntent immutable." into pi-dev am: 416332cf" into qt-dev am: 2426f275 am: 8a6fa4c1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12715966

Change-Id: I42f66a255836d5b92476484054756baad67de7b5

[automerger skipped] Merge "[DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry" into qt-dev am: 0b5b9eed am: e45ec287 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12664597

Change-Id: I90b8806dfa4bf3b4717c1ecb50661487a9590717

[automerger skipped] [DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry am: 81bab8b8 am: e1a23c7e -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12664597

Change-Id: I6fb22f36f2615f337699817083991ba741a3938e

[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-mr1-dev am: 3d92e370 -s ours am: 8a936e08 -s ours am: b9edc63f -s ours

am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 f955e56d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12729621

Change-Id: Iafd009c9fb724e499a10a071fddec997a322de76

[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-mr1-dev am: 3d92e370 -s ours am: 8a936e08 -s ours

am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 f955e56d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12729621

Change-Id: I375dcd7dd68d2cf8acb61024de119fc741c4124d