[automerger skipped] Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23" into qt-dev am: d38c2bc0 am: 28c85af5 -s ours

am skip reason: subject contains skip directive

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



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