Merge changes from topic "presubmit-am-b521fdc3415843d792ac3226b71ecb4a" into sc-qpr1-dev

* changes:
  [automerge] Backport missing permission check for querying main activity intent 2p: b319280964
  Backport missing permission check for querying main activity intent