Merge changes from topic "am-e13afa5ac25a4c9f9470dd99b11304a0" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into rvc-qpr-dev am: 29a03aa0 -s ours am: 706fdb06 -s ours am: 9d383010 -s ours am: 9fc3dfe4 -s ours am: 8a092df8 -s ours am: c31a5428 -s ours am: 08531398 -s ours
  [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: d4d6b18e -s ours am: a3281827 -s ours am: 4546e81f -s ours am: d0df74d0 -s ours am: 4f5459ab -s ours am: 04aefce0 -s ours am: 724ef53f -s ours