Merge changes from topic "am-c399be4a96434da5bf4e1c28f8fd167d" into tm-d1-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-dev am: 1ee3c74d am: 362c47c6 -s ours am: d06f5f0f -s ours am: 07acb763 -s ours am: d5397bc4 -s ours am: a088b653 -s ours am: 2a402bfe -s ours
  [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: f11f26c0 -s ours am: eee34d14 -s ours am: 45db391c -s ours am: dab9b6f6 -s ours am: 46991d96 -s ours am: 936f6680 -s ours am: b91e1923 -s ours