[automerger] Revert "CTS Test for Android Security b/74612220 b/68399439" am: c90bb4b67f am: d1982f252c am: 806afe1f0b am: 27d77a5801

Change-Id: If319e1fd4b4896bad7d566654111cf56b7019079