Merge "BpfNetMaps: do not register BpfNetMaps JNI before T" am: 277b236de3 am: 41ab1ebbc9

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

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