[automerger skipped] Merge "RESTRICT AUTOMERGE Allowlist alarm-clock alarms from pre-S apps for FGS" am: 337bb720f4 -s ours am: 7ad4387627 -s ours am: 774751dfc6 -s ours am: b798ff2acd -s ours am: 41aa2bb3cd -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2161252 Change-Id: I5042f06a8bbefbd4ce09d6dc671428a61f36b4a9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: