Merge "Merge "Merge "Fix the incorrect usage of test_exclude_features" into marshmallow-cts-dev am: 3df64a3478" into nougat-cts-dev am: 3b5d3d32e8" into nougat-mr1-cts-dev am: 35fe0c4110 am: 63c3225a5c am: 08d03ba5d8
am: 08de880d94

Change-Id: Ic80eb052b08d6babc455e91f7b5afa5752f0f1d6