[automerger skipped] Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23" into rvc-dev am: 6664a27f76 am: 104d33007e -s ours am: 4c7445249a -s ours am: 89f1ee19ab -s ours am: 9954f0b16e -s ours am: 3163204ea9 -s ours am: 1d38cda106 -s ours am: 908cc6bb72 -s ours am: 960c30cc48 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20105226 Change-Id: I61c0f10055a47c9a14d45023ba8355f76293d07a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: