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

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

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