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

Change-Id: I7cf0ffa2d53dd2e1d3441759eaa9fe348459644e