Merge "DO NOT MERGE test if b/65484460 is fixed." into oreo-mr1-cts-dev