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

Change-Id: I43f861b01814ab8b097f6848d4472e08e5c0898e