[automerger skipped] Revert^2 "Use the latest temperature read as base for...

[automerger skipped] Revert^2 "Use the latest temperature read as base for headroom calculation" am: 0a4add42 -s ours

am skip reason: Merged-In I706933e7f4bbd1b9abd6591255a605d7643ad7ee with SHA-1 436e7d8b is already in history

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



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