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

Change-Id: Iebc6356304bb7a4cd9ff9a3af28bb24343938cd7