Merge "Add API to compute charge time remaining." into pi-dev am: ba6f173cb1
am: ec69f61cc4

Change-Id: Ic383fb123232f0a69221bda7fa489922dd6a5218