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

Change-Id: Ia00b3009e3ed0bac1084b5d1cebaa137e33ee373