Revert "[RESTRICT AUTOMERGE] CTS test for Android Security b/34897036" am: 8e8b5e73 am: a4a3292b Change-Id: I267f1c94e3cb30777a6d375ea5aa4efcc802f526