[automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into sc-dev am: 391cabb1 am: 4239eb38 -s ours am: 2fb42151 -s ours am: f985bcbc -s ours am: 1e89f983 -s ours am: 2976cc3b -s ours am: 09d5a36c -s ours

am skip reason: subject contains skip directive

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



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