[automerger skipped] Merge "ScreenPowerCalculator is responsible for smearing"...

[automerger skipped] Merge "ScreenPowerCalculator is responsible for smearing" into sc-dev am: 8f15e41d am: af2f6145 -s ours

am skip reason: Change-Id I30b436b736e96071a1e4167d37512d250119665c with SHA-1 3754504f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b10ba31adc8baa8788f7f5070b1ba23b6f42d75