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 am: 632d2ff2

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



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