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