[automerger skipped] RESTRICT AUTOMERGE Show tip/edge hints for UDFPS...

[automerger skipped] RESTRICT AUTOMERGE Show tip/edge hints for UDFPS enrollment am: 1d4c7dc0 am: 385d2220 -s ours

am skip reason: Merged-In Ifda20133f1ee90c9e1612e9066c19efbb6ffc9cd with SHA-1 3edacaab is already in history

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

Change-Id: I8b18dbc26471b84a65c613eb3a2839638d8c145e