[automerger skipped] Merge "Merge "Add ThermalMitigation API to Telephony." am: 3c12991e" into stage-aosp-master am: b827d75b am: 1d638eab -s ours

am skip reason: Change-Id Ib4be5edf063e4c54e9238b0403f59e1621df671e with SHA-1 30f372a7 is in history

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

Change-Id: I79ce5c721275c3370bdc5550cad0a58fd8450547