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

[automerger skipped] Merge "HBMController thermals via BrightnessThrottler" into udc-dev am: 4cf16072 am: 36a04993 -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: Ibb09c5157679d0f587ec89b7a1263fbcb315eb96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>