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

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

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