Merge "[RESTRICT AUTOMERGE] Remove unnecessary tests" into oreo-cts-dev