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

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

am skip reason: Merged-In I706933e7f4bbd1b9abd6591255a605d7643ad7ee with SHA-1 e23c5ede 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: I6b243f1896222c75c7ec3c84de9bd9e3b24b438f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>