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

Change-Id: I178d9dd66013106950c07fd5274e902b9db1fa36