Merge "Merge "Fix the incorrect usage of test_exclude_features" into marshmallow-cts-dev am: 3df64a3478" into nougat-cts-dev am: 3b5d3d32e8 am: f952979750 am: 456e58847f am: 5ef9a3821d
am: 3b54d73bb2

Change-Id: I3c3585dd2c486df3c4bb53a5790a6260d6829e74