Merge "Fix...

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

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



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