Merge "Enforce basic thread safety in Audio Policy Service" into rvc-dev