Merge "Merge "[automerger skipped] Merge "Revert "DO NOT MERGE test if b/65484460 is fixed."" into oreo-cts-dev am: 5b021a18ce  -s ours" into oreo-mr1-cts-dev am: 6fdb58a2af  -s ours" into pie-cts-dev