[automerger skipped] Merge "Update ukey2_jni API usage" into aosp-main-future am: dcfbb73522 -s ours am: ccf5f16686 -s ours am: 2be51dbf6a -s ours am: dba7e1288c -s ours

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

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

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