Merge "Update ukey2_jni API usage" into aosp-main-future