Merge changes I03e7cda7,I675c4ef5

* changes:
  Allow ethernet on automotive to set allowed UIDs
  Updating Eth CTS to account for existing ifaces

service/src/com/android/server/ConnectivityService.java

@@ -7825,6 +7825,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
         }
         nai.declaredCapabilities = new NetworkCapabilities(nc);
         NetworkAgentInfo.restrictCapabilitiesFromNetworkAgent(nc, nai.creatorUid,
+                mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE),
                 mCarrierPrivilegeAuthenticator);
     }