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

Change-Id: Ia627b0f5a410ef4b231cfc0d4c0053d675f6791b