Merge "gn2bp: Add JNI jarjaring prefix" am: d5e981bcd7 am: 8c406090c7 am: 6f0ce98f6b

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2376228

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