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: Ie054d644b69cf16d661c39900c609e239eb0b190