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

Change-Id: Idf5db4a573515c6c993159ba5dcd9f441e2b68d5