RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23 am: fba194b998 am: 513478d63e

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

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