[automerger skipped] Merge "Split TeleService into a client apk and a lib." am: 57fcf958a2 am: 7ec293c89b am: c29a5ca881 -s ours
am skip reason: Change-Id I3cd7dd692ec9325a10aa7ae63e77240c7ad58112 with SHA-1 35e5fcb1b2 is in history

Change-Id: Ia192530c622e244c9ff4af5b9267d64778c60c60