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