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

Change-Id: Ia809fa20321c7dcdb9e8470abae314fcb4c75fe8