Merge "Use hard-coded string to represent the ukey2 role when salting the...

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24827551



Change-Id: I1a8aaa02e44680f9ff3351d658299a0c8480bf6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>