[automerger skipped] Revert "[RESTRICT AUTOMERGE] CTS test for Android Security b/24346430" am: 4af7f62c03 am: 9614ba5795 -s ours

am skip reason: subject contains skip directive

Change-Id: I54d216ab1c53f8dbaf1c19d4ac4ee8cd6ee19a79