Merge "thermal: allow vendor_init to setprop thermal properties"