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

Change-Id: Iec7f207648a7df13c2d963be4b48f3286ded2dc2