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

Change-Id: I37ec878ac1629e0f145481863b82ad59572c7e73