Merge "Merge "Add ThermalMitigation API to Telephony." am: 3c12991e94" into stage-aosp-master