Merge "Add Tethering's UID to the legacy type NetworkCapabilities"