Merge "For devices with udfps, always show bg on udfps" into sc-dev am: d2e60974 am: 041083ad

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

Change-Id: I742c8fc874ba7595171d37639018d0ade7464402
Merged-In: I5a19d3cd45c51af78a49d46126fc0678a3df6d6c