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 am: c02132e73d  -s ours
am: e36dc8efe3

Change-Id: I1b3c3859089bf5cb074ee3acaa993db1f1a3c2a5