Merge "Update thermal related string to support non-phone device" into...

Merge "Update thermal related string to support non-phone device" into udc-qpr-dev am: b6629a26 am: ae8b22db

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23810724



Change-Id: If88c6c160dd75e662eda93ad7b0d5633d486ea4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>