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

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

Change-Id: I2bff9a72ce2e8c94e4ba61c014aebd31529e5554