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

Merge "Fix deadlock for system location clients" into rvc-dev am: b297119c am: 243af9e9 am: 27ec4f69

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

Change-Id: I32d2e74b75bd9bbf16f272ce40b15a78ebefe162