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

* changes:
  Merge changes from topic "scdevbug" into sc-qpr1-dev am: 367d37a9 am: f4241e62 am: 29eeb2f9 am: 9ae7f4b6 am: edf460ba
  [automerger skipped] [automerge] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q 2p: 23aac9cb am: 75ed22a7 -s ours am: f02d6d93 -s ours am: 1d184708 -s ours am: 0754cfe4 -s ours am: 074c669f -s ours