Merge "[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" into pie-cts-dev