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