[automerger] Revert "CTS test for Android Security b/63522067" am: 5101344599 am: c11c24df10 am: c3d5f8560c am: 847cedba1e am: 7ff9323f95 am: 5fc1731329
am: 4d79b50d6e

Change-Id: Ica48262d6a892c077a5884b3736a500312d809a9