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

Change-Id: Ibb0c5deae658f3eb02cda2d6af07e6cac57058e2