[automerger skipped] Merge "Fix PixelCopyTest failure in CTS"
am: b773556215  -s ours

Change-Id: I6d5d15e89dcf03c8002452018b1e8922890d2814