Merge "CTS test for Android Security b/27903498 b/72507578" into pi-dev