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