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

Change-Id: I4470b633d2004b3b96c1b97d7503ec47985f22ea