Merge "Keystore 2.0 SPI: Add EC_CURVE tag on key generation."