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

Change-Id: Iaea1ccf81020a27f5dc17b101029dae1d1a15e06