Merge "Thermalmanagerservice: Add shell interface to inject temperatures" am:...

Merge "Thermalmanagerservice: Add shell interface to inject temperatures" am: 21877c39 am: 4057e05e am: ce720ea0

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



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