Merge "CTS/STS test for Android Security b/36492827" into nyc-mr2-dev