Merge "Revert changes to StationaryThrottlingLocationProvider" into sc-qpr1-dev am: 7cb452002e am: 06d206da75

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

Change-Id: I84e9c9297522c1366c961a6503e9b4a280fe8846