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

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

Change-Id: Ia0563c82ac1da5401d6374f1575ea88c0ce646b0