RESTRICT AUTOMERGE Show tip/edge hints for UDFPS enrollment am: 1d4c7dc05b

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

Change-Id: I6a29077a98cf47caa8203501ecc95e7fe687cccc