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