Merge "Audioflinger intercept track retry on buffer end"