[automerger skipped] Merge "RESTRICT AUTOMERGE Show tip/edge hints for UDFPS enrollment" into sc-dev am: 9d0955d75f am: d8c320a0d0 -s ours

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

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

Change-Id: I9f3b6138f9dfc84586f558f95138cecb13ee3244