[automerger skipped] Merge "RESTRICT AUTOMERGE Allowlist alarm-clock alarms...

[automerger skipped] Merge "RESTRICT AUTOMERGE Allowlist alarm-clock alarms from pre-S apps for FGS" am: 337bb720 -s ours am: 7ad43876 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I9ba56c1a091470616922a510d970af9cae612893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>