Merge changes from topic "scdevbug" into sc-qpr1-dev

* changes:
  [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