Merge "Annotate thermal CTS tests for CDD 7.3.6" into sc-qpr1-dev am: 516c3b1df7

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/16033431

Change-Id: Ic19424b9c103fd2c8e86a86edb384e669f35e6a6