Merge "Add more connectivity module settings" am: 9abe34a466 am: 88d4fc79df

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

Change-Id: I269802c5a036181e9eaf90862dbf50b66610f78d