Merge "Restrict devices shipped post-Q with Thermal HAL 2.0"