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

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

Change-Id: I89dcfb0881ed144434d0c8a796c47dcffbc6e00e