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

Change-Id: Ibe73d69f99d7dfb9419f415826a5324122dc36af