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

Change-Id: Icff5c0ca59fc04377bd6beeff09e65b0d2170f17