Merge "Revert "CTS test for Android Security b/137879783"" into oc-dev am: 6ac77d8dc0 am: accd2939c9 am: 3abb7ad565 am: ce0711ed63 am: 3d25238959

Change-Id: I91221de0c144957c11d7a49e1fe7e8368027550a