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

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



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