Merge "Revert "Add SdkSandboxActivityAuthority"" into main