Remove divider line for battery card preference

Use CardPreference directly here instead of preference category
Also clean up code and test a little bit.

Bug: 119618813
Test: RunSettingsRoboTests
Change-Id: I3ee2313c10e6e2e34609137f3dcb0391104377d5
5 files changed