Merge "Revert changes to StationaryThrottlingLocationProvider" into sc-qpr1-dev am: 7cb45200 am: 00da43be am: f936e61c

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

Change-Id: I3cacbce91a92de23a00bf4de320e6e537fe649af