am 0c391da3: am 3fafcc8a: am d26d2bf6: Merge "Fix GpsLocationProvider to return GpsStatus and Nmea events. b/16393308" into lmp-dev

* commit '0c391da32542c1186b81128e9a6725eb5744999c':
  Fix GpsLocationProvider to return GpsStatus and Nmea events. b/16393308

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

@@ -322,7 +322,7 @@ public class GpsLocationProvider implements LocationProviderInterface {
     private GpsStatusListenerHelper mListenerHelper = new GpsStatusListenerHelper() {
         @Override
         protected boolean isSupported() {
-            return native_is_measurement_supported();
+            return GpsLocationProvider.isSupported();
         }
     };