Merge "Merge "Require non-null HAT for fingerprint enrollment" into sc-dev am: 0295c273 am: 1c21f45b" into sc-v2-dev-plus-aosp am: 6159b3d0

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

Change-Id: I249a80e45b17a5f11d83950c8a805e5931d143e8