[automerger skipped] Merge "Update ukey2_jni API usage" into aosp-main-future...

[automerger skipped] Merge "Update ukey2_jni API usage" into aosp-main-future am: dcfbb735 -s ours am: ccf5f166 -s ours

am skip reason: Merged-In I901b7606acee3dc0ce9bcf47e02b7a299c73cb89 with SHA-1 73acca1e is already in history

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



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