[automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: f11f26c012 -s ours am: eee34d1470 -s ours am: 45db391cd7 -s ours am: 9f6770eb6a -s ours am: 63b0977b81 -s ours am: e54270029b -s ours am: 7157cf1c48 -s ours

am skip reason: subject contains skip directive

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

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