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

Change-Id: I42041afe19e43a5ab7f00376f5b9ab727e6571d0