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

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



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