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: 5c55e68d am: 68b36c95

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



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