Merge changes from topic "scdevbug" into tm-dev

* changes:
  [automerged blank] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q 2p: 23aac9cb8e 2p: 3ea7195f3b
  [automerge] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q 2p: 23aac9cb8e
  DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q