am fba5881d: am 1593d94b: am fb9a664b: Merge "Zen: Reset zen + ringer modes on upgrades to M." into mnc-dev

* commit 'fba5881d1ccb2f22efb34783a482a36f1b189f93':
  Zen: Reset zen + ringer modes on upgrades to M.