[automerger skipped] Merge "CTS test for Android Security CVE-2017-11041" into...
[automerger skipped] Merge "CTS test for Android Security CVE-2017-11041" into oc-dev am: 26b33006 am: bf695537 -s ours
am skip reason: Change-Id Ib970302f0363e5a98d6c6f4c1ee7c78d4a05eed7 with SHA-1 1fe30cc2 is in history
Change-Id: If4c04eaf75717b296a79e41ad611647a095bdcf2