[automerger skipped] Merge "HBMController thermals via BrightnessThrottler"...

[automerger skipped] Merge "HBMController thermals via BrightnessThrottler" into udc-d1-dev am: 836938c6 -s ours

am skip reason: Merged-In Ib0c06d18457386abd6cd12211cca77804076e4cc with SHA-1 476f58d5 is already in history

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



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