Merge "Refine BatteryInfo and battery drawable" into oc-dev am: 57af565fb7
am: 24638307c2

Change-Id: Ifae38f01a454fe9dcea1fbde0ea1a57a15087d8a