Merge "Drain BPF ring buffer after disabling tracing." am: 00b4e1ca38

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

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