[automerger skipped] Merge "Migrate tethering notification resources" am: 42968586aa am: 2548410cf6 -s ours
am skip reason: Change-Id I832103090d500fd8e2e2efb9dc7151426da3f88d with SHA-1 1b41052cfc is in history

Change-Id: I8b73500a3a1d029c97658ac3299ba9194600029d