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

Change-Id: I0baa29ac0dc3e3621b5eb55b26e39bacbf30c138