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