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 sc-dev am: 18db5856

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



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