Merge "Add usesCleartextTraffic to Tethering"