Merge "[SettingsProvider] fix connectivity test" am: 5e64a14ccf am: bb015ef2af

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

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