[automerger skipped] Revert "[RESTRICT AUTOMERGE] CTS test for Android Security b/109891727" am: 2cb23eedf8 -s ours

am skip reason: subject contains skip directive

Change-Id: Ic9aab1c4dcaa1d180464950782f058cc94a1e7d2