[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: 80f99e8a61 -s ours am: 46c08f6365 -s ours am: f53d1a37ba -s ours am: 50fea28d81 -s ours

am skip reason: subject contains skip directive

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

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