bacon: Merge an upstream fix for wcnss-service

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Merge https://github.com/CyanogenMod/android_device_oppo_msm8974-common/commit/cb9ba94a7c9898206cf9663f2bf82187c07ef678

Signed-off-by: franciscofranco <franciscofranco.1990@gmail.com>
Not using thermal-engine anymore, so make the appropriate changes.

Signed-off-by: franciscofranco <franciscofranco.1990@gmail.com>