[automerger] Revert "CTS test for Android Security b/24157524" am: 40495120a0 am: e0f178fe36

Change-Id: Id27ea17cb215b30e723404b3aa07f214aa498cd9