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 rvc-dev am: 6664a27f

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



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