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

am skip reason: subject contains skip directive

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

Change-Id: Ifdc70fb7e9a7ca98f8fa41d6fead7e9f33e5a485