Merge "Remove string power_charging_duration_short" into oc-mr1-dev am: 367838be4f
am: ff1a4ecacf

Change-Id: Ic037573b2c7e4e761831a608045a1399eabaf4a1