Merge "Prepare for refactoring wifi ipserver start/stop" into tm-dev am: 7150b94f11

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

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