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

Change-Id: I154d610ab9a2f69ceab85e369d3bfe944514b65b