Merge changes from topic "am-14bf5a3fba3143bdb2d095df4a013d3a" 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: fe73c5d7 -s ours am: 4dcde38c -s ours am: 939c6daf -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: 9f6770eb -s ours am: 63b0977b -s ours am: f763751b -s ours