[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 rvc-dev am: 1ee3c74d am: 362c47c6 -s ours am: d06f5f0f -s ours am: 07acb763 -s ours am: d5397bc4 -s ours am: a088b653 -s ours am: 2a402bfe -s ours am: 04266c29 -s ours am: adb0134f -s ours

am skip reason: subject contains skip directive

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



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