[automerger skipped] Update ukey2_jni API usage am: 5e08dd1b -s ours am:...

[automerger skipped] Update ukey2_jni API usage am: 5e08dd1b -s ours am: aa6113dd -s ours am: fc97a927 -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: Ie9f67ae01f7775b96bda3a8a0b17438488747735
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>