Merge "CTS test fix for small screens" into oreo-cts-dev am: ad1bb552b8
am: 94ef68df53

Change-Id: If92c19a40e51c1733eba57100c855a6f83bc6ee1