[automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: d4d6b18e3a -s ours am: a3281827dd -s ours am: ba8ecd8b49 -s ours

am skip reason: subject contains skip directive

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

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