[automerger skipped] Merge "Merge "For devices with udfps, always show bg on...

[automerger skipped] Merge "Merge "For devices with udfps, always show bg on udfps" into sc-dev am: d2e60974 am: 041083ad" into sc-v2-dev-plus-aosp am: 51f19d8d -s ours

am skip reason: Merged-In I5a19d3cd45c51af78a49d46126fc0678a3df6d6c with SHA-1 294e8a1e is already in history

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

Change-Id: I8411b89619d6be029ead09539de4d456ee37d721