Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23" into tm-dev am: 9c542a7386 am: d0c8dddc69

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

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