[automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] CTS test for Android Security b/120644655"" into oc-mr1-dev am: 0bea59f257 -s ours am: 9d85638442 -s ours am: 848e741039 am: 7ed7cb14bc

Change-Id: I7f1cb1a6cf2a2fcc9858f0411f6c0c20aca0ed1e