Merge "ConnectivityService - do not dumpBpfProgramStatus before T" into main am: cfdf420ae2 am: 75de7ab243

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

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