Merge "Add separate mutex for BPF ring buffer." into main am: 312777655a am: aa95e91448

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

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