Merge "CTS test for Android Security b/27903498 b/72507578" into pi-dev am: e40a8452e3 am: f1599e245a am: a2ebef3667 am: 1019f219f7 am: 503f541267

Change-Id: I61df300e0be830559a7c8cc7aed4d56727d96a51