Merge "Fix BatteryManager.getIntProperty returns 0 as invalid value."