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

Change-Id: I761afa5d2e9df8486d3186716b7db1992b8e09d8