Merge "Keystore 2.0 SPI: Switch to aidl union KeyParameters"