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

Change-Id: I9fd3e7161213f919f514f51e5b51ddcb2d6f3246