Merge "Revert "[RESTRICT AUTOMERGE]: CTS test for Android Security b/71909578 b/28760453"" into nyc-dev