Merge "Revert "[RESTRICT AUTOMERGE] Add test to known failures"" into oreo-mr1-cts-dev