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: I27b9d1116920c1bfb9f311f015546d56e8792b8f