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

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

Change-Id: I6b28d0d97881225ae1e396bf319a9a4f5fa9fbcd