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

Merge "For devices with udfps, always show bg on udfps" into sc-dev am: d2e60974 am: 7e67690b am: f606f354

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

Change-Id: I5d4520af9d9189ad9cd1d55cd8c9fbe2045c2c72