[automerger skipped] DO NOT MERGE Fix bug in getCurrentLocation cancellation am: 05f32ddfab am: 67e6f8a6a6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6733272b87df18f5efb1f5ac13751edd03c89540