Revert submission 30375632-revert-30294757-catalyst_battery_percentage-RPJNJOPEZI
Reason for revert: the failures is part of the robolectric issue b/378822459. Tested locally that the change is not breaking ClockworkSetupWizardRoboTests.
Reverted changes: /q/submissionid:30375632-revert-30294757-catalyst_battery_percentage-RPJNJOPEZI
Change-Id: I2210002924650cb54c55a41be25d97a3997c065e