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

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



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