[automerger skipped] Merge "Restrict alarm broadcast" into oc-mr1-dev am: 3b0fc6bd38 am: d749dc3510 am: fd89965284 am: 90ef2704fa -s ours
am skip reason: Merged-In I4f8e56729d90f8f5288d08881129b1c45d5790e7 with SHA-1 4056976f1e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14103469
Change-Id: I1a85b8c3024307a9d780eb1c404a9baa17a4f696
This commit is contained in: