Merge "Merge "Fix the incorrect usage of test_exclude_features" into marshmallow-cts-dev am: 3df64a3478" into nougat-cts-dev