Merge "Harden and clean up KeyGenParameterSpec." into mnc-dev