Merge "[RESTRICT AUTOMERGE] Revert "CTS test for Android Security b/72507125 b/27532522"" into nyc-dev