Revert "CTS/STS test for Android Security b/62214264" am: a2e1390f05 am: 7636dc1803 am: 927fb94121 am: 0e4fea117a am: 38eefa8119 am: 4dc4399704
am: 29dd1c0596

Change-Id: Iab542861d1fdf52a5f45689f580ff90c71807b76