Merge "RESTRICT AUTOMERGE Show tip/edge hints for UDFPS enrollment" into sc-dev am: 9d0955d75f

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

Change-Id: If4311547812c153ddf44bd3de84f455925be60c1