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

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

Change-Id: I11a592566f098851a05ca0cc37a3a935e81ee895