[automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if...

[automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: dd48aab8 -s ours am: 4415b0ba -s ours am: 1d0b69e3 -s ours

am skip reason: subject contains skip directive

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



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