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

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

Change-Id: I78d66dbfb98d0bd8f5db7df46185cfe48a83279b