Merge "Add ConnectivitySettingsManagerTest" am: 6160d60b2e

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

Change-Id: I7c88e70340aa61cf2e54955bbf3ffad7bb7ccd89