Merge "BatteryManager: Add battery status to getProperty"