Merge "Merge "PixelCopyTest fails on ldpi devices" into oreo-mr1-cts-dev am: 035fab8fe4" into pie-cts-dev am: d6a7ca3165
am: aacb5acbb1

Change-Id: Id5cd0ec0f07db4b3d30661aedcda2b2b87bc86d3