Merge "Fix boot time BatteryStats reset failure" into sc-dev am: ebf77ebc51 am: f65cbbbe42
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15128655 Change-Id: I4f72131a6513b3b33f6be357b39bab577feba576
This commit is contained in: