Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23" into tm-dev am: 9c542a7386 am: d0c8dddc69 am: c849d793a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20036692 Change-Id: I2cde8ab4becd56f2a623ce5972346a728bbfee66 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: