[automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: e37a0ac9f8 -s ours am: 26f72ff555 -s ours am: 64f36a1646 -s ours am: 5bcb8a2fea -s ours am: 59cdac45ce -s ours am: 24283b6dd6 -s ours

am skip reason: subject contains skip directive

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

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