Merge "Making PixelCopyTest pass with the outsets that Android Wear uses for chin devices" into oreo-cts-dev