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

Change-Id: I541870bde62a0ce71745efb4aec4780c8e2ed3d5