Merge "Fix Zen mode for different notification usage types" into nyc-mr1-dev am: 156a29f981
am: f6132fc0d4

Change-Id: Ib88c0d589b0a530af44500552b388e850fa4d344