[automerger skipped] Merge "Revert "Use the latest temperature read as base for headroom calculation"" into 24D1-dev am: 01ea34486d -s ours

am skip reason: Merged-In I706933e7f4bbd1b9abd6591255a605d7643ad7ee with SHA-1 e23c5ede71 is already in history. Merged-In was found from reverted change.

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

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

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