Merge "CTS/STS test for Android Security b/25818142" into mnc-dev am: 2d75fbfc55
am: fee8bcfeb9

Change-Id: I249edb877f088215b82a7dc03cb592c70a1df947