Merge "Fix regression from location changes: GPS battery tracking." into jb-mr1-dev

services/java/com/android/server/location/GpsLocationProvider.java

@@ -845,6 +845,9 @@ public class GpsLocationProvider implements LocationProviderInterface {
                 }
             }
         }
+
+        // save current uids
+        mClientUids = uids;
     }
 
     @Override