Merge "Workaround to support low-area UDFPS on BP" am: 2490ffdc5f am: b3b52c3eaf am: c48c44d2f4 am: 9dd0866b1a

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

Change-Id: I317b23bbca1e10bb2d706e9cce724867386e8720