[automerger] Revert "Revert "CTS test for Android Security b/63522067"" am: ad18dcaa am: d87db3fb am: d92ed5b5 am: 8d3ee7d2 Change-Id: I745ebbd11494bafbbf71bcbb7aaa0d2655123e18