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

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

Change-Id: I65148caa88fc9b30cd0684533ec74550f15ad070