Merge "CTS/STS test for Android Security b/35644812" into nyc-mr2-dev
am: 646dbd43ce

Change-Id: I8b9d5a062dde86c36749824bd4825d30f2974b1c