[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 skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 4056976f is already in history

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

Change-Id: I1a85b8c3024307a9d780eb1c404a9baa17a4f696