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

Change-Id: I6ed908742d307a3263af45dd52934c6a404613be