[automerger skipped] Merge "Restrict alarm broadcast" into oc-mr1-dev am:...

[automerger skipped] Merge "Restrict alarm broadcast" into oc-mr1-dev am: 3b0fc6bd am: d749dc35 am: fd899652 am: 90ef2704 -s ours am: 2a061f2e -s ours am: d295decb -s ours am: 81285249 -s ours

am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 7dfcfe85 is already in history

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

Change-Id: Id956de36d4be564daa5d640a9f3d7c638eb43f68