Merge "[RESTRICT AUTOMERGE] Remove unnecessary test." into oreo-mr1-cts-dev