Merge "Get rid of any unnecessary reset calls" into main am: ce6f14073c

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

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