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