Merge "Remove android.os.cts.NoExecutePermissionTest#testExecuteCode test" am: 6fde827336
am: ff32fe4c1c

Change-Id: I5d95ff597157debcb2bf56f344fd3b6bfb95df90