Merge "Require non-null HAT for fingerprint enrollment" into sc-dev am: 0295c273bd

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

Change-Id: I93851639799814d45aaeb6a16fd89f308eaebae7