[automerger skipped] Merge "DO NOT MERGE - Disables testTapLink_changeOrientationThenTapBack if the screen is too small." into oreo-mr1-cts-dev am: c9843fdedf  -s ours
am: 5828596a5d  -s ours

Change-Id: I24cb1e0917485cdd2be7ceaf75c9ca29531663a6