Merge "AudioFlinger: Fix incorrect underrun count on track pause"