am bb785c6a: am c37c7d9d: Merge "Do not require USE_FINGERPRINT for getAuthenticatorId." into mnc-dev

* commit 'bb785c6a5c103b1221047f202eb42d8f4c32d8d8':
  Do not require USE_FINGERPRINT for getAuthenticatorId.