Merge "Merge "cts: adapt dimensions for small screen devices" into oreo-cts-dev am: 2c61026d04"
am: 7cbcc6d83b

Change-Id: I7a84598df219a9c50ff9c73cb0c58eb919c02451