Merge "Fix misplaced UDFPS UI after rotation" into sc-v2-dev am: 93173672cb am: 556a84af1d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16713029

Change-Id: I550be559bb22bfa30002dbb660d83351e25ec8f7