Merge "Merge "CTS test fix for small screens" into oreo-cts-dev am: ad1bb552b8" am: 41cde070dd am: 4e3a3a72fc
am: 5b82db678c

Change-Id: I325912c59a648ae0a0475a9c1e36fd892ab8f452