Merge "Use SettingsShim to hide different implementation in shim" into sc-dev am: 4547356487

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

Change-Id: Iee71677f0cf215e546fc9dca53d72e0f67edd115