Merge "Fix regression in CTS for AudioTrack" into lmp-dev