Revert "Use waitForService() istead of getService()" Revert submission 2264526 Reason for revert: Droidfood blocking bug: 262191143 Reverted changes: /q/submissionid:2264526 Change-Id: I32906f3c406ec0e4c1f83671bb988ae0e5d17dff (cherry picked from commit b882ada7861fbacbc7ec12f8c3bc2d94e5f97f2e) Merged-In: I32906f3c406ec0e4c1f83671bb988ae0e5d17dff