Merge "Merge "Merge "Merge "Merge "DO NOT MERGE - add comments to indicate false-positive CTS 5.1 tests for Automotive devices." into lollipop-mr1-cts-dev am: 880a57a82d  -s ours" into marshmallow-cts-dev am: 3cc8a3d1a2  -s ours" into nougat-cts-dev am: 64fdeb1923  -s ours" into nougat-mr1-cts-dev am: 0a2ee77ea8  -s ours am: 8cc611c7c0 am: a6fefdc7e8 am: fb73749d78" into nyc-mr2-dev-plus-aosp
am: 46abb942b6  -s ours

Change-Id: I7d66fa0a53e2341450867dc44d4b179336773c89