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

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

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



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