[automerger skipped] Merge "RESTRICT AUTOMERGE Revoke dev perm if app is...

[automerger skipped] Merge "RESTRICT AUTOMERGE Revoke dev perm if app is upgrading to post 23 and perm has pre23 flag" into rvc-dev am: 9b00dd41 am: 3e878fd7 -s ours am: 70f6c1e3 -s ours am: ff8dbfb3 -s ours am: cc488a9f -s ours

am skip reason: subject contains skip directive

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



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