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

Change-Id: I653951f1aac8113ecfe373b0e69a455ccd46796c