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

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

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