Merge "Migrate battery mitigation to Thermal AIDL" into udc-dev