Merge "Migrate tethering notification resources" am: 42968586aa
am: b2f4fd86fe

Change-Id: If4abd499dfa9152f78b85fe7c486e814089aad8e