Merge "FusedLocation runs per user as user" into jb-mr1-dev

Author: Victoria Lease

packages/FusedLocation/AndroidManifest.xml

@@ -18,16 +18,14 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.android.location.fused"
-        coreApp="true"
-        android:sharedUserId="android.uid.system">
+        coreApp="true">
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.INSTALL_LOCATION_PROVIDER" />
 
     <application
-            android:label="@string/app_label"
-            android:process="system">
+            android:label="@string/app_label">
 
         <uses-library android:name="com.android.location.provider" />