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 am: 12db8972 am: 6cfbd96e am: 3091bc06

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



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