Fixup for battery.

I'm hoping this makes batteries work with this change: https://android.googlesource.com/platform/frameworks/base/+/fe0e1e445fe697d59baf5736da20356a4e548fc9%5E%21/#F0