[automerger skipped] Revert "Fix DeviceConfig resetting." am: 9afd779325 -s ours
am skip reason: Change-Id Ib0ac49609e444a53a6fee4575f5078e15f364eef with SHA-1 2812f607a0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13698292
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5673c06d611ef029c8a3d5a46edfe812a1c889aa
This commit is contained in: