Separate hybrid key logic into a helper function.

Keystore2 super key handling is being refactored in preparation for
Unlocked-Only Storage.

This code is complicated and should be moved to its own function.

Bug: 280502317
Bug: 277798192
Test: Wiped device. Setup user with PIN. Ensured unlock works. Remove
    PIN. Ensured unlock works. Added pin and biometric. Ensured unlock
    works.  Rebooted device. Ensured unlock works.
Change-Id: I0602a8229cdd149d4f9b42a96f446d2a17df1321
1 file changed