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

Change-Id: Ice2c79c126177c1bdd9a9cd81281d12d9a0cfb2b