Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev