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

Change-Id: I6e75a6a63762e7d3f1fadc93da787ae472832934