[automerger skipped] Merge "DO NOT MERGE - Revert "DO NOT MERGE Adding testTapLink_changeOrientationThenTapBack to known failures"" into oreo-mr1-cts-dev
am: 30d5591a3a -s ours
am skip reason: subject contains skip directive

Change-Id: Ic697be1f1396a37f8d026d318032e853c79b336d