Merge "Define String constants for AndroidKeyStore crypto." into mnc-dev