[automerger skipped] Merge changes from topic...

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

am skip reason: Merged-In I3c27deb57672d962f1029219b50d21d784c997b7 with SHA-1 5ee2f6ca is already in history

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

Change-Id: Iab75d03157addd99834a20a163d2492d3ea5caee