Merge changes from topic "presubmit-am-28395e19f737446e92e70dc9b28f2424" into sc-v2-dev-plus-aosp

* changes:
  [automerge] DO NOT MERGE: SurfaceControlViewHost: Restrict disclosure of input token 2p: 0cfda55b95
  DO NOT MERGE: SurfaceControlViewHost: Restrict disclosure of input token