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: 59cdac45 -s ours am: 24283b6d -s ours am: a09af2c7 -s ours" into tm-d1-dev-plus-aosp am: 7d60d043 am: 4bb609a6 -s ours

am skip reason: subject contains skip directive

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



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