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

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

Change-Id: I2d4726fb8a6a85a5ddf6646289e0ba308b3061a8