Merge "fix CtsSecurityTestCase[instant] test bug"