Merge "In small screen, it is better for skip this case." into oreo-mr1-cts-dev
am: 3103f71d7f

Change-Id: Ib6804b71f199802185f5b7b346a066b2aefd0086