Merge "Fix Connectivity Manager test:"

<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

  package="com.android.connectivitymanagertest"

  android:sharedUserId="com.android.uid.test">

  android:sharedUserId="android.uid.system">

    <!-- We add an application tag here just so that we can indicate that

         this package needs to link against the android.test library,