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

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

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



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