Merge "Make the new AndroidKeyStore API conformant."