[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 skip reason: subject contains skip directive

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



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