[automerger skipped] Merge "Migrate TeleService to aapt2." am: 0080349d29
am: a3d478574e  -s ours

Change-Id: Iebf9fba2416b2b1fa068d045d69b12273b59a043