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

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

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