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

Merge "[automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: e37a0ac9 -s ours am: 26f72ff5 -s ours am: 64f36a16 -s ours am: 5bcb8a2f -s ours am: 25e99541 -s ours am: 79649ba2 -s ours am: 561afcee -s ours am: ac7ad80b -s ours" into tm-d1-dev-plus-aosp am: 3b563707

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



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