Merge "Update ukey2_jni API usage" into udc-dev-plus-aosp am: 4419e86d86 am: 00a69a455d am: 74f4b1b4d4

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

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