Merge "Merge "Fix deadlock for system location clients" into rvc-dev am: b297119c am: 3d5ca434" into rvc-d1-dev-plus-aosp am: b53bb948 am: 56e070ee

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

Change-Id: Ic00106749261ccb37c5bf15326cc030301760e38