Merge "Prepare for refactoring wifi ipserver start/stop" am: bf9d2fc1fe

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

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