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 am: 80684c3e

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



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