Merge "Replace SystemNotificationChannels on Tethering"