Merge "Fix wait time for audio threads in suspend mode" into oc-dev
am: 24fd2f7d29

Change-Id: Idfb70a5c7f3d532e9946940ef15639abe884bba2