Merge "Enable java bpf map always in U devices" am: ae4431aadc am: 9ac6a3371c

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

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