Remove unused test service and add test using other.

Bug: 132420445
Change-Id: Icbf1905befede4cd6078df1a11b394526b4135ee
2 files changed