Merge "AudioFlinger: Modify flush handling for offload path"