Merge "Merge "Add automotive feature to exclude feature of test case "Car Dock Test"." into marshmallow-cts-dev am: 418bf4efb7" into nougat-cts-dev
am: dd88145533

Change-Id: I6100a2846561249e41432acd3e4909104b9a6728