Merge "Save alarm resources" into sc-v2-dev am: 6665ad79a3 am: 072ea78e70

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16141434

Change-Id: I7ab808776029e9323ebda2ac99007f9710fd8917

services/core/java/com/android/server/location/provider/LocationProviderManager.java

@@ -1996,6 +1996,11 @@ public class LocationProviderManager extends
                         + TimeUtils.formatDuration(delayMs));
             }
 
+            if (mDelayedRegister != null) {
+                mAlarmHelper.cancel(mDelayedRegister);
+                mDelayedRegister = null;
+            }
+
             mDelayedRegister = new OnAlarmListener() {
                 @Override
                 public void onAlarm() {