Merge "Revert "Split TeleService into a client apk and a lib.""
am: f3ce569c3e

Change-Id: Id0e9ed6c0034b313cc4516515e788137577e2bb8