Merge "Let GrantCredentialsPermissionActivity opt out edge-to-edge" into main