Merge "Replace SystemNotificationChannels on Tethering"
am: 3e1548f5a5

Change-Id: I9b566b25369eafc0456d4e9b383b9decf954995b