Merge "CTS-test Android Keystore primitives accept empty." into mnc-dev