[automerger skipped] Merge changes Ic80f2904,I5aeb09d0 into android13-tests-dev am: db1970ddbd -s ours am: 7ed7acf7da -s ours

am skip reason: Merged-In Ic80f2904e34224ef78677b61c135c20865186f4f with SHA-1 1e7c21388f is already in history

Original change: https://android-review.googlesource.com/c/platform/external/deqp/+/3020909

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