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

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

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