Merge "Fix boot time BatteryStats reset failure" into sc-dev am: ebf77ebc am: f65cbbbe am: 8c0a60b7

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

Change-Id: If31d90d4490c9ededdd2f33c989a95da4904083b