[automerger skipped] Merge "DO NOT MERGE Synchronize ZenModeControllerImpl callbacks"
am: 85666351d7  -s ours

Change-Id: Ib0a64133cbc3e5d2fe268ae8c6983850f8fe714e