tree 93da7c713b2f6112e72bfe21f59e62d6429c4614
parent 85648a39606572bea699e8ed1e0f1374123ba360
parent 6cfbd96e493bfd96cda2ad019bd8421d022e5ed4
author Raphael Kim <raphk@google.com> 1695760070 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695760070 +0000

Merge "Use hard-coded string to represent the ukey2 role when salting the authentication token." into aosp-main-future am: ffc308aab8 am: 12db897275 am: 6cfbd96e49

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

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