[conflict] DO NOT MERGE Fix auto-grant of AR runtime permission if device is...

[conflict] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: 84b1160c

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



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