[automerger skipped] Revert "[RESTRICT AUTOMERGE] CTS test for Android Security b/34897036" am: 8e8b5e73 am: a4a3292b am: e19fe503 -s ours am skip reason: subject contains skip directive Change-Id: Iee1cd2cd7f3f0858b6d4c6bf30e9c85784c35950