Merge "linkToDeath on BiometricPrompt#authenticate" into rvc-dev am: e6fe6013cb

Change-Id: I70840c874cc2aa139fcc2164e4bc600873c9a1e8