And remove obsolete "muted by <x>" disablement. Bug: 19260237 Change-Id: I17dc6d5761aad9ce70cc5aad054489549113e15e