Merge "Don't report silence state in ACTION_SILENCE_MODE_CHANGED"
am: a25a47f5cf

Change-Id: If225364de16e38560917ad154a16229f1b26cfc4