Merge "Update error handling in BpfNetMaps" am: f2eca2f13a am: c3f1a475c3 am: 1535739ba8

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

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