Merge "BatteryManager: Add API and service for battery property retrieval"