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

Merge "[automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into qt-dev am: e893eff6 am: dc45b9fe -s ours am: 0f8fc1a4 -s ours am: e0cb2bee -s ours am: 191abef1 -s ours am: 1dd4d7a1 -s ours am: 727120aa -s ours am: d5706ee0 -s ours am: 0310d646 -s ours" into tm-qpr-dev-plus-aosp