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

Merge "[automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: e37a0ac9 -s ours am: 26f72ff5 -s ours am: 64f36a16 -s ours am: 5bcb8a2f -s ours am: 59cdac45 -s ours am: 24283b6d -s ours am: 97645574 -s ours am: 39b67eb6 -s ours" into tm-qpr-dev-plus-aosp