[automerger skipped] Merge "DO NOT MERGE Remove the placeholder test failure during preparation" into oreo-mr1-cts-dev
am: d634323640  -s ours

Change-Id: I8f900dcb8ae0cfbf1e69691ceab77106606e4d06