Merge "Add Tethering's UID to the legacy type NetworkCapabilities"
am: 2aed62d664

Change-Id: I3d93baafab1bc9be4bee6246cc3e04682363a690