[automerger skipped] Merge Android 12 am: 49f7103b37 -s ours am: d6bf52a601 -s ours am: 8014b5ad4d -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: I2b494f75c523d7c533c61cd450f1d140687f702b