fix mismerge
Revert "Update battery battery by m7wlj CM sources"

This reverts commit f9d11e38d1e78d1f29106f6079fbad371e45eee3.
Revert "Fix battery issue(WIP)"

This reverts commit 000c34f8ab06eb4d8576b718d2af1f46a5b8ba64.
Revert battery changes