Merge "[automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Add test to known failures"" into oreo-mr1-cts-dev am: 94cf9325e7 -s ours" into pie-cts-dev