[automerger skipped] Merge "RESTRICT AUTOMERGE Revoke dev perm if app is upgrading to post 23 and perm has pre23 flag" into rvc-dev am: 9b00dd413d am: 3e878fd78f -s ours am: 70f6c1e320 -s ours am: ff8dbfb354 -s ours am: cc488a9fb3 -s ours am: 3016eca3ca -s ours

am skip reason: subject contains skip directive

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

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