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
am: d8dff631c9

Change-Id: Icf2e84a4040c472b8008eec97704b23c1346c0fa