Merge "[automerger skipped] Merge "HBMController thermals via BrightnessThrottler" into udc-dev am: 4cf1607275 am: 36a04993e1 -s ours"