[automerger skipped] Merge "DO NOT MERGE Fix bug in getCurrentLocation cancellation" into rvc-qpr-dev am: 0c04c701 am: 4619f14f -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icdb8be2db454800b397317a69f07940b0e6d5654