Merge "Add ConnectivitySettingsManager" am: 3e17e82ab1 am: af229a6c7b

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

Change-Id: Ie780e244374478d3e7bcd00cecbdfcb5edc600d6