Merge "Add a carrier config to block tethering." am: 1c12d0790e am: 49f5c7b9ab

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

Change-Id: If303812111d7e9bccf1fcac0e1c88e959bab080d