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

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

Change-Id: Icc5ee044eb6203e2df5d881134246693bfa8f665