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

Change-Id: Ia6cbe7235c8bb22f912adb7484137519eb14ca9c