Revert^2 "Fix IllegalStateException in getSupportedPowerMonitors API"

This reverts commit 6aaf75cac05e845aafcd0dc8230aba2441b84d28.

Reason for revert: Rolling forward the original change with a fixed test

Test: atest PowerStatsTest:PowerStatsServiceTest
Bug: 309070737
Bug: 310083260
Change-Id: I344f5117a50432572dec42cddc43a1a45970acb0
2 files changed