Merge "Revert "Fix IllegalStateException in getSupportedPowerMonitors API"" into main