[automerger skipped] Merge "linkToDeath on BiometricPrompt#authenticate" into rvc-dev am: e6fe6013cb am: 3b2d32e9fd -s ours am: 966cb34585 -s ours

am skip reason: Change-Id Ib573466edac7dd95a8c031e0533cbca693b806f6 with SHA-1 1c042ba4b9 is in history

Change-Id: I7de37e98f66cbeb41cbc4e5d69b84551469f821c