Merge "Fix...

Merge "Fix CtsOsTestCases.android.os.cts.PowerManager_ThermalTest#testGetThermalHeadroomThresholds errors" into main am: 2c880275 am: 1d2e8a19

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



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