Revert^2 + fix tests for "Scale battery text size in shade in low display sizes."

This reverts commit 2239fa79 and corrects tests.

Reason for revert: Tests are not corrected, we are using ComposeTestRule instead of @Composable annotations. Ran the test locally and verified it passes

Bug: 438705602
Bug: 413620149
Change-Id: Ia4791f76426118ceeded17963933ebb9c65aa03b