[automerger skipped] HBMController thermals via BrightnessThrottler am:...

[automerger skipped] HBMController thermals via BrightnessThrottler am: 478afa4a -s ours am: 4b31d624 -s ours

am skip reason: Merged-In Ib0c06d18457386abd6cd12211cca77804076e4cc with SHA-1 35676e1c is already in history

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



Change-Id: I886d41af306953f26bdd4205023493f374287291
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>