[automerger skipped] Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23" into sc-dev am: 18db5856cc am: 15ff346130 -s ours am: fa245b1ef3 -s ours am: 08daf34256 -s ours

am skip reason: subject contains skip directive

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

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