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

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

Change-Id: I16f30ea7cc9a9c619cb32623dbcc2d21c9936874