[automerger skipped] [RESTRICT AUTOMERGE]: Revert "CTS test for Android Security CVE-2018-9525" am: e10ed2679e -s ours am: fea6774199 -s ours am: 5da5b12d82

Change-Id: I03f53a8d34c690f8806e652a57e12f6beadccb35