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

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

Change-Id: Ib3e91b3dbac1294707ee5642ab03598225b683ef