Merge "AudioFlinger: Prevent offload underrun during active playback" into nyc-dev
am: be4a316499

Change-Id: If7c7da1e193854674956bcac9fabdd6a81c1ba0a