Merge "Fix BatteryService enum inconsistent with BatteryManager" into main