Merge "Remove CallServiceProvider and CallServiceDescriptor do not merge" into lmp-dev