[automerger skipped] [automerge] RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23 2p: 5e80fcf8c4 am: 8b3c10d855 -s ours am: d6035aa84e -s ours

am skip reason: subject contains skip directive

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

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