Merge "BatteryManager: rename BATTERY_PROPERTY_BATTERY_STATUS"