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

Change-Id: I64f523164c64e88b00c2388153e95d3e3d870afb