Revert "Revert "[RESTRICT AUTOMERGE] CTS test for Android Security b/120789744" am: 037e8a0a8b am: f089172457"

Test: sts-tradefed
Bug: 153751318
Bug: 120789744
Bug: 126802825

This reverts commit f7f7f978037200689ce30377749c39bcb1d8d208, reversing
changes made to 437bd9e7a362b587d74be3d9295df9356ba8b8e1.

Change-Id: I9fa8709a9472adc0cf9e89041a0241c17492f193
4 files changed