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

Change-Id: Icf428422f68b5ee4ccaba207ed8eda20411918b9