[automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime...

[automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into sc-dev am: 391cabb1 am: 4239eb38 -s ours am: 2fb42151 -s ours am: f985bcbc -s ours

am skip reason: subject contains skip directive

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



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