Merge "waitForIdle to avoid stubbing mocked bpfNetMaps while CS is accessing" into main am: 65bb6527cd

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

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