Merge "Revert "CTS/STS test for Android Security b/36075363"" into nyc-mr2-dev
am: c3556b4829

Change-Id: I69ea0aaef9ed47cb905df57503d365747b66840a