Merge "On devices with udfps, hint to press to open" into sc-dev am: 555c174a am: 35d68aa1 am: 31e4b832

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

Change-Id: I508ab5c518808b6276d0cd4ff1fc63208dde673a