Merge "Fix BatteryStatsImplTest." into sc-dev am: 4162c032bf am: d6956bc287

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15291010

Change-Id: I19bc29d6bf83c8d077e9b8961fcc41100edf3f27