[automerger skipped] Merge "Measured screen energy into BatteryStatsHelper"...

[automerger skipped] Merge "Measured screen energy into BatteryStatsHelper" into sc-dev am: 52534776 -s ours

am skip reason: Change-Id I0eaa4bc594cb31b4a26b5488b08114cbf80e3884 with SHA-1 30594e82 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86a0ea0d9f604ee10bc20ef788609f78f7f9a396