Merge "RESTRICT AUTOMERGE Revoke dev perm if app is upgrading to post 23 and perm has pre23 flag" into rvc-dev am: 9b00dd413d

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

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