[automerger skipped] Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on...

[automerger skipped] Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23" into rvc-dev am: 6664a27f am: 104d3300 -s ours am: 4c744524 -s ours

am skip reason: subject contains skip directive

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



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