Merge "Fix Zen mode for different notification usage types" into nyc-mr1-dev am: 156a29f9 am: f6132fc0 am: f557db65 Change-Id: I1b1942dea4787d888605afdc6b17bd608de84474