Merge "Fix BatteryStatsImplTest." into sc-dev am: 4162c032bf am: fa116b0d18 am: bc58d33e1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15291010 Change-Id: Id915f2988b5161cd658b39fd957589a81472d3ef
This commit is contained in: