base

Fix problem where power manager was calling battery stats with bad wl type.

Also fiddle code to reduce duplication.

Change-Id: I3f1b086e53ef88dac1ec1896fe711b3cfe7fdd58