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

Change-Id: I31eac5f1953eb00c253a140dd9d3959055936eba