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

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

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