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

Change-Id: I3027ffa14999577e32c5fc2fbda27893114570cd