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

Change-Id: Ia349103207615ea6666de2a81b271b86de3af9cf