[automerger skipped] Merge "CTS test for Android Security CVE-2017-17767" into oc-dev am: bb8b761f65 am: 08247b1760 -s ours am: 8e3d199563 -s ours am: 32b7adde7e -s ours am: 11f089b3d9 -s ours am: 2cb5eba5bf -s ours am: fc0a4331d8 -s ours
am: 610074ec45 -s ours
am skip reason: change_id I400fa822be019af31aad0a0fe3c4a7f4858581d6 with SHA1 2eaac15e47 is in history

Change-Id: I362c200d656510b4f48412c9ba6daa8940c815bf