am c6865806: am f5d3f960: am 2a6f1d4a: Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev

* commit 'c6865806a4f76c44bc3cc55cff87cc85f0a48061':
  ZenModeHelper: fix cross deadlock with AudioService