Merge "Zen: Simplify notification policy api, add zenmode api." into mnc-dev