[automerger skipped] RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23 am: f6ba142a84 am: 33b93dc60c -s ours am: 7da50b5652 -s ours am: b86e0b967a -s ours

am skip reason: subject contains skip directive

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

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