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

* changes:
  [automerge] [DO NOT MERGE] Keyguard PIN View - Landscape fixes 2p: 3695a34ec9
  [DO NOT MERGE] Keyguard PIN View - Landscape fixes