Merge "Update ukey2_jni API usage" into udc-dev-plus-aosp