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

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

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