Revert submission 2866127-HwNoService

Reason for revert:
DroidMonitor: Potential culprit for Bug 315883998 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:2866127-HwNoService

Change-Id: I4e98dfecdc3c7f1ecd10f713f45c8245769dd03e