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