Merge "Disable notification sounds on TV" into oc-dev am: b5979092b8 am: d537d3778b
am: 38ce905a3f

Change-Id: I02e69396b1bd8e108a04e562933cd1051a38c927