Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718" into lollipop-cts-dev am: 11e21252eb  -s ours" into lollipop-mr1-cts-dev