Merge "Add defaults to enable/disable connectivity/tethering next" am: 0f56af4162

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

Change-Id: I586210796d858538194d5da91f972405bb850b34