Merge "Use hard-coded string to represent the ukey2 role when salting the authentication token." into aosp-main-future