Merge "Fix typo in Android Keystore key alias used in CTS."