Merge "dumpstate: add thermal/power HAL dump" into qt-dev am: 88b197a747
am: 8c00d204ab

Change-Id: I804ba308d85bd99c431bfe203536460815e732e0