Merge "Stop and start netd explicitly for "adb shell stop/start"."