Merge "Migrate tethering notification resources"
am: 42968586aa

Change-Id: I4d6cf3c750aedcb8b16b3ead34e449a2e0a987d0