Revert "Separately timing out different power groups"

This reverts commit 6f1fafb9ecfeac77da58924e3b760e68c33e9040.

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

Bug: 414444200
Bug: 421201132
Change-Id: If557bb83e0a4a21b4cbe66fb4a26d001e28efbb1
8 files changed