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