[automerger skipped] Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23" into qt-dev am: d38c2bc0ce am: 28c85af5dd -s ours am: 527e832744 -s ours am: 86124f2a83 -s ours am: d5fa2c29df -s ours am: 8ed0832a3b -s ours am: 40069bd9d4 -s ours am: ce040d5f55 -s ours

am skip reason: subject contains skip directive

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

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