Merge "AudioFlinger: Associate audio time with client uid"