[automerge] RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23 2p: 5e80fcf8c4

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

Bug: 221040577
Change-Id: I3bcdcad1dc932b0f6e32b6946b34d8569afc78ad