Merge "Remove unnecessary converting us to ms in BatteryInfo" am: f4ababa50b
am: 8d7f25430b
am: 8ca39b70d0
am: 4cd9b740a3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1749740 Change-Id: I373fd285b82bd95d765f849b141ab2d995ae1929
This commit is contained in: