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

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

Change-Id: I5863cf464bcb0e3a215d7de5e7b6e3812fe78988