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 am: 0879036d

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



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