[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 skip reason: subject contains skip directive

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

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