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