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

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

Change-Id: Ic99f192addb0f793e365d36d735da3cc9fc1c31f