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

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

Change-Id: Iec0d52f7a9f7e2f09397f92fc45ed9ee202a7cf0