Merge "power: qpnp-bms: clean up vbatt functions"