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

Change-Id: I46fc2299481ae193677578d8883022f3e94553a5