Merge "Add ConnectivitySettingsManagerTest" am: 6160d60b2e am: f37dd31334

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

Change-Id: I239c14543f6948cb729424008054317b28bb9647