[automerger skipped] Revert "CTS test for Android Security CVE-2018-9525" am: 1a6f621808 am: f28204ee7c -s ours am: 03b19a17c2 -s ours am: 97e8333361 -s ours am: cfec715c09 -s ours am: 69211da5b6 -s ours

am skip reason: Change-Id Ia78e3360d5ae29ff32e89d504f120d2346b93c46 with SHA-1 e10ed2679e is in history

Change-Id: Ie1c7de8f224222adbfe28b35a92b0d191793e067