[automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] CTS test for Android Security b/112662184"" into pi-dev am: f50980b4f8 -s ours am: 93460841f7 am: 31e0da2d4f -s ours

am skip reason: subject contains skip directive

Change-Id: Id8ad2d21685fb95831086c05f90fb7f6ee3540c5