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: 389b814e -s ours" into tm-d1-dev-plus-aosp am: 9ca9971f

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



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