Merge "[automerger skipped] [conflict] DO NOT MERGE Fix auto-grant of AR...

Merge "[automerger skipped] [conflict] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: 84b1160c am: 0a761a95 -s ours am: 6732f330 -s ours am: 6bfd59aa -s ours am: c0994ae1 -s ours am: a9c783ef -s ours am: 6e1514c3 -s ours am: 9890461b -s ours am: df7e32f5 -s ours" into tm-qpr-dev-plus-aosp am: 54f9005f -s ours

am skip reason: subject contains skip directive

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



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