Merge "Fix PixelCopyTest CTS issue" into android12L-tests-dev