Merge "Add SYSTEM_TELEVISION_NOTIFICATION_HANDLER" into sc-dev