Merge "gn2bp: Add JNI jarjaring prefix" am: d5e981bcd7

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

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