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

Change-Id: I8da831b1f2f288499fdbd89d35df5d204aeede80