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

* commit '4f7eee438be7e51d7988a2a61123139e74b7b802':
  Leave zen when apps set ringer-mode = non-silent (normal/vibrate).