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

Change-Id: I03fc18993389eda919baffc76b8bab4d9c43751d