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: Icdd36a3e7325b11cefbb4962ec66e1a031b3a773