Merge "Keystore 2.0: Fix shared secret negotiation for Keymaster 4.x"