Merge "Merge "Merge "DO NOT MERGE - add comments to indicate false-positive CTS 5.1 tests for Automotive devices. am: 409661b1b8  -s ours am: dd8cda5c8f  -s ours" into nougat-cts-dev am: cce1bfc7a0  -s ours am: 10b98dcaa6 am: e419a60535" into nyc-mr1-dev am: d6f81816c4 am: 94b8439511 am: 6131419368" into nyc-mr2-dev-plus-aosp
am: e825503c9e  -s ours

Change-Id: I8d09ad7b58ba30cd3158f0ae0f8246dafa40d317