Merge changes from topic "battery_usage_stats_before_reset" into sc-dev am: 4f3d2e64

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

Change-Id: I1853c59e82c1d6ab0259c907d3529fce25790190