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

Merge "Update thermal related string to support non-phone device" into udc-dev am: ad17acbc am: 34cfa923

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



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