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

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

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

Change-Id: I7b371787afd50c914b4579692c04b1996b924558