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 am: 649f6589e9  -s ours" into nougat-cts-dev am: f053119e30  -s ours am: 45072a3ff8 am: b0c2d629bc" into nyc-mr1-dev am: d68639ecce am: 8427adf4af" into nyc-mr1-dev-plus-aosp am: e8e73b047c
am: 1c10165762  -s ours

Change-Id: I0fce67cae0409427207c56651abe7292ba47287c