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

[automerger skipped] Merge "Revert^2 "Use the latest temperature read as base for headroom calculation"" into 24D1-dev am: 6f0c5020 -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: I93922c4de74632beaf70c61a72a8cc8ef604bde4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>