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