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

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

Change-Id: Ibd3983e68bb8381fd2faa18b83b3ea6734339c44