Merge "Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev am: a18a8a1ad0 am: fa4d019839" into sc-v2-dev-plus-aosp