Remove duplication of test exclusions

Change-Id: I0da6f034db216d57a8c57325ce72545816c4f188
Merge "Remove duplication of test exclusions"