Merge "Deprecate thermal@1.1 HAL for launching devices." into stage-aosp-master am: 83bb776d31
am: 848e0b9a16

Change-Id: I63d01088156bd41abc1480304f821991bb28f74e