Merge changes from topic "am-6ad70fae7b334288bb2ac79cc83b996d"

* changes:
  [automerger skipped] Merge "HBMController thermals via BrightnessThrottler" into udc-dev am: 4cf1607275 -s ours am: 88535f62f3 -s ours
  [automerger skipped] HBMController thermals via BrightnessThrottler am: 478afa4a35 -s ours am: 4b31d62445 -s ours