This reverts commit c0646936.

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

Change-Id: I61142ddd3c43e4d23b0594e1222b208c8751de74