am 3d4aec1b: am b2344c81: Merge "Leave zen when apps set ringer-mode =...
am 3d4aec1b: am b2344c81: Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev
* commit '3d4aec1b':
Leave zen when apps set ringer-mode = non-silent (normal/vibrate).