[automerger skipped] Merge Android 12 am: 49f7103b37 -s ours am: d6bf52a601 -s ours

am skip reason: Merged-In If8e5f59c2abe9354539fa498f9a8ee3bdf1bc065 with SHA-1 b4d3a5ea1f is already in history

Original change: https://android-review.googlesource.com/c/platform/external/OpenCL-CTS/+/1847347

Change-Id: Icafa007e9ff60aab10975b4a8b56b3b6a77889c9