[automerger skipped] Merge "Revert "Split TeleService into a client apk and a lib."" am: f3ce569c3e am: c2cd41d29f am: 2bdf885796 -s ours
am skip reason: Change-Id Iaf897c2b38c92b1c9be74c9705520f462d58785b with SHA-1 292bedaae5 is in history

Change-Id: I1c27af851fc08bf1ee80d060738f400de42a68ea