Merge "CTS test for Android Security b/72507702 b/27661749" into pi-dev am: ce793cf59c am: 2dfaf2d7e8

Change-Id: Ia4fb6a0292b62a20d68f7fdbf33bd61f6de01778