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: Ib26d987aba671a5fabf2d0548127f4648d76725b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>