am e939edb5: am f418738c: am d7fa7dee: Merge "Fixes update of extras Bundle in new Locations for GPS Provider"

* commit 'e939edb5b4e991998ae8219b03d75c10cdc765cb':
  Fixes update of extras Bundle in new Locations for GPS Provider
diff --git a/services/java/com/android/server/location/GpsLocationProvider.java b/services/java/com/android/server/location/GpsLocationProvider.java
index 00788ba..588fa93 100755
--- a/services/java/com/android/server/location/GpsLocationProvider.java
+++ b/services/java/com/android/server/location/GpsLocationProvider.java
@@ -1077,6 +1077,7 @@
             } else {
                 mLocation.removeAccuracy();
             }
+            mLocation.setExtras(mLocationExtras);
 
             try {
                 mLocationManager.reportLocation(mLocation, false);