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

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

Change-Id: I914b9d91974ba6a49ba865e7e41d4a37626f5730