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

Change-Id: I2c9a3443f795a970efddee346c01dee64788e70d