Merge "Update ukey2 references" into main am: 2ab8f35e51

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

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