Merge "Add ConnectivitySettingsManager" am: ef226d7a44 am: 7cf52fb928

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641759

Change-Id: Ie780e244374478d3e7bcd00cecbdfcb5edc600d6