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

* changes:
  [automerge] Fix misplaced UDFPS UI after rotation 2p: ec6e4e8172
  Fix misplaced UDFPS UI after rotation