Merge "Migrate TeleService to aapt2."
am: 0080349d29

Change-Id: I150266db1a171f3d12a8f9ee419bf1756f39e3e4