Revert "Use waitForService() istead of getService()"

Revert submission 2264526

Reason for revert: Droidfood blocking bug: 262191143

Reverted changes: /q/submissionid:2264526

Change-Id: I32906f3c406ec0e4c1f83671bb988ae0e5d17dff
1 file changed