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

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

Change-Id: I33841584d4a73e4b20747b2beaf63aaa47a8e7ac