Merge "Migrated TeleService to androidx."
am: c3ebef7136

Change-Id: I79349b153f36cd565ec668ae661ce6913ef019ff