[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "battery_usage_stats_before_reset" into sc-dev am: 4f3d2e64 am: 34344ef6 -s ours

am skip reason: Merged-In I3c27deb57672d962f1029219b50d21d784c997b7 with SHA-1 0d25efa4 is already in history

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

Change-Id: I765e34802148446c510c1b3709d28f6c1787db5e