Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is...

Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into rvc-dev am: 1ee3c74d

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



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