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
am: 2cbcc0ada9

Change-Id: I58f1c034d2f3a29f6a6f4c14a853e83f7edd94f4