Merge "Align AndroidKeyStore API with user auth API." into mnc-dev