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

Change-Id: Id621564a9511c32d7785834d693928a1aab56f38