[automerger skipped] Merge "Replace {@code} with backticks in thermal NDK comment" into main am: e9d9f40 am: 121faf3 -s ours

am skip reason: Merged-In If5456fdc009b1154101cdae95d8d2943b030fbad with SHA-1 684eaa7 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3368406

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

Author: Treehugger Robot