Revert "[RESTRICT AUTOMERGE] CTS test for Android Security b/120789744" am: 037e8a0a8b am: f089172457

Change-Id: If6497d645f447635ba14a1334cf5cdeba387f6f3