Merge "The Test SelfManaged calling app should not share cts userId" into udc-dev