Merge "Migrated TeleService to androidx." am: c3ebef7136
am: 27f825e8be

Change-Id: I985aa63c2135489e675e93a6f4d3fa9f5292b195