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

Change-Id: I24b10399995e51c0846443a41aa19fdea95d206e