Fix a bunch of derps

Change-Id: I6eb856566c75129816709bbbe8bc3fdcf31735fb
Revert "Allow setting a per-device default configuration for STATUS_BAR_BATTERY"

This reverts commit da3d10cba4a12b37fa7aed26b62232f3923ae583.
derps

Change-Id: I5374fda582e100ca42dab1c3a9c9147a20a5c0da