Merge changes from topic "am-dc4cdda350c548b99cac15442f8c5235" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-994c84d568054c049282d3d0e9c67263" into sc-mainline-prod am: 27ca7443 -s ours am: 81561d14 -s ours am: 1e751e7f -s ours
  [automerger skipped] [automerge] Enforce ComponentName belongs to caller app 2p: b479180b am: 2e641315 -s ours am: 36048a39 -s ours am: abd5c9a1 -s ours