Merge "Require non-null HAT for fingerprint enrollment" into sc-dev