Merge "Fix auto-grant of AR runtime permission if device is upgrading from...

Merge "Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into tm-dev am: 1bcaa0dd

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



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