RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23 Bug: 221040577 Test: atest PermissionTest23#testPre23AppsWithSystemAlertWindowGetDeniedOnUpgrade Change-Id: I4b4605aaae107875811070dea6d031c5d9f25c96 (cherry picked from commit fba194b998cf22d073a36cb5c6f9397c2dc1a50e) Merged-In: I4b4605aaae107875811070dea6d031c5d9f25c96