Merge "Drain BPF ring buffer after disabling tracing." am: 00b4e1ca38 am: 8145c0bdac am: 3de6b89f59

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

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