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

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



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