Merge "Fix the test failure in GtsPermissionUiTestCases" into main