Merge "Expand keyset cts key rotation tests to include EC keys." into mnc-dev