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

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

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