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