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: 25e99541 -s ours am: 79649ba2 -s ours am: 561afcee -s ours am: ac7ad80b -s ours am: c238a4a0 -s ours" into tm-qpr-dev-plus-aosp