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

Change-Id: I4317c73f407866ee41fdbcc0682f28da05b0d230