Merge changes from topic "am-38eae739df6b4af0ac5f91bbe684b61d" 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 sc-v2-dev am: 6c7ca7e1 -s ours am: 22e63219 -s ours am: 226334a2 -s ours
  [automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: dd48aab8 -s ours am: 4415b0ba -s ours am: d5fcdb8c -s ours