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

Change-Id: I758f9cd4c8e4d4a3fc22e438ff6f569a2e6ee702