[automerger skipped] Merge "RESTRICT AUTOMERGE Revoke SYSTEM_ALERT_WINDOW on upgrade past api 23" into sc-v2-dev am: 19e8834210 -s ours am: 27ee710fd2 -s ours am: 1140bee96f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20106245 Change-Id: Ide84ace182a35763a366620c2f73ab7157c8d74c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: