Merge "Revert "CTS test for Android Security b/137879783"" into oc-dev am: 6ac77d8dc0

Change-Id: Ife83470b46d8f411ffc1f333046643c8c541c644