[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: b4d3a5ea1f -s ours

am skip reason: Merged-In I9b91f1c5340fe445b7609bbea37c3126e92616ae with SHA-1 2825a1e58a is already in history

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

Change-Id: Ib95aa896dcb6afff46ef464138c815d1b121f5c1