Merge changes from topic "presubmit-am-87faed4a998c421fb52d7c407d7577eb" into sc-v2-dev-plus-aosp

* changes:
  [automerge] DO NOT MERGE Allow pinEntry field to be outside pin_container 2p: 2bbaf5d099
  DO NOT MERGE Allow pinEntry field to be outside pin_container