Merge "Update ukey2_jni API usage" into udc-dev-plus-aosp am: 4419e86d am: 00a69a45

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



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