Merge "DO NOT MERGE Fix bug in getCurrentLocation cancellation" into rvc-qpr-dev am: 0c04c70178

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

Change-Id: I9eabaae1d4f75e5eaaeda8e464532c12f3a558b7