[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 qt-dev am: e893eff6 am: dc45b9fe -s ours am: 0f8fc1a4 -s ours am: e0cb2bee -s ours am: 191abef1 -s ours am: 1dd4d7a1 -s ours am: 727120aa -s ours

am skip reason: subject contains skip directive

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



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