DO NOT MERGE Fix bug in getCurrentLocation cancellation am: 05f32ddfab

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

Change-Id: I88c44a53eefc0ecc222526cd4cc921a5e9411f37