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

Change-Id: I577b06fb7b377017b64cea9a590355db033c23bb