[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: f11f26c0 -s ours am: eee34d14 -s ours am: 45db391c -s ours am: dab9b6f6 -s ours

am skip reason: subject contains skip directive

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



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