Merge "CTS test for Android Security b/33129467" into nyc-mr1-dev