[automerger skipped] Restrict alarm broadcast am: d61aae29 -s ours am:...

[automerger skipped] Restrict alarm broadcast am: d61aae29 -s ours am: 08db350c -s ours am: 80b1e85c -s ours am: f08bd224 -s ours am: 3ec2ca42 -s ours am: 267965a8 -s ours

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

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

Change-Id: I19f2c92557b0ebf5e40d6d248f30a31a12ad0936