Merge "CTS/STS test for Android Security b/36731152" into nyc-mr2-dev
am: 4fbc6919fa

Change-Id: I283518f6470588087a5601c528993a9bb29836aa