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

Change-Id: Ib79fb7016d9673b66cc599df34d33b2602500a26