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

Change-Id: I3cf0883e9e7352da67308e4dd40eb56b9301bcd6