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

Change-Id: Ic6650facc043c1478d8e8d3705c4350cb3a2447b