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

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

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