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

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

Change-Id: Ib5ec1f8cc443d1b92215e6ab200fa383d719d053