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

Change-Id: Id59fa7ab5960ba03aecdf38e0640c3597a4531b9