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: 5d858377 -s ours am: 2e886b1b -s ours am: 07dab0c6 -s ours am: fec43f98 -s ours am: 8fdd8a15 -s ours" into tm-qpr-dev-plus-aosp am: 6d586482 -s ours

am skip reason: subject contains skip directive

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



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