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

Merge "Merge "Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into tm-dev am: 1bcaa0dd am: 5c55e68d" into tm-d1-dev-plus-aosp am: 112ffc89

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



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