Merge "Keystore 2.0: Add support for the new CERTIFICATE_* tags."