Merge "Keystore 2.0: Fix shared secret negotioation for sharedsecret interface."