Merge "@hide CAPABILITY_CALL_PROVIDER" into lmp-dev