Merge "Fix deadlock for system location clients" into rvc-dev am: b297119cdb

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

Change-Id: Iec1a929662bd78ef52e7be8cf7de92f334ac40e8