Merge "Revert "CTS test for Android Security b/137879783"" into oc-dev am: 6ac77d8d am: accd2939 Change-Id: I2d2de930455f6b32708214203d8eab979c9487e8