Merge "Fix failures in AudioTrack listener test" into lmp-dev