RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23 am: f6ba142a84

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

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