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

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



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