Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23"...

Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23" into qt-dev am: d38c2bc0

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



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