Merge "Merge "Fix PixelCopyTest CTS issue" into android12L-tests-dev am: 9b64856d70" into android13-tests-dev am: 29f3c9ed77 am: e7cfe2f48b

Original change: https://android-review.googlesource.com/c/platform/cts/+/2478915

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