Merge "Split TeleService into a client apk and a lib."
am: 57fcf958a2

Change-Id: I1b1f8846133a06ae32d88c9c98702e9c57b8076b