Merge "CTS/STS test for Android Security b/36604779" into nyc-mr2-dev
am: 8e7183ec4c

Change-Id: I65659b420ec2bcf4057c6470fca46cfdbd90bb7a