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

Change-Id: I74e6f5813d3f86c54bb774f73e548d6beb5b7c7a