am 24d7c503: (-s ours) am a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev

* commit '24d7c503a1a8c72e9541e33a7e6412d0591d546f':